From: Gert Wollny <gewo@debian.org>
Date: Wed, 6 Sep 2017 10:08:10 +0000 (+0000)
Subject: d/p/08: Update: set CANONICAL_HOST_TYPE from cmake, Closes: #859203
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~211
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9ace04788bf99c76fff5cd3fd5fec0a153b3f2a6;p=dcmtk.git

d/p/08: Update: set CANONICAL_HOST_TYPE from cmake, Closes: #859203
---

diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
index 526c5779..880bdf29 100644
--- a/debian/patches/08_remove_system_processor.patch
+++ b/debian/patches/08_remove_system_processor.patch
@@ -4,10 +4,11 @@ Author: Gert Wollny <gw.fossdev@gmail.com>
 
 --- a/CMake/GenerateDCMTKConfigure.cmake
 +++ b/CMake/GenerateDCMTKConfigure.cmake
-@@ -115,15 +115,6 @@
+@@ -114,15 +114,7 @@
+ #ENDIF(VTK_USE_ANSI_STDLIB)
  
  # Configure file
- 
+-
 -# Windows being windows, it lies about its processor type to 32 bit binaries
 -SET(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
 -IF(NOT SYSTEM_PROCESSOR)
@@ -16,10 +17,10 @@ Author: Gert Wollny <gw.fossdev@gmail.com>
 -# CMake doesn't provide a configure-style system type string
 -SET(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
 -DCMTK_UNSET(SYSTEM_PROCESSOR)
--
++SET(CANONICAL_HOST_TYPE "Debian")
+ 
  # Configure dictionary path and install prefix
  IF(WIN32 AND NOT CYGWIN)
-   # Set DCMTK_PREFIX needed within some code. Be sure that all / are replaced by \\.
 --- a/CMake/dcmtkPrepare.cmake
 +++ b/CMake/dcmtkPrepare.cmake
 @@ -389,11 +389,6 @@
@@ -34,27 +35,3 @@ Author: Gert Wollny <gw.fossdev@gmail.com>
  
  ENDIF(WIN32)
  
---- a/config/include/dcmtk/config/osconfig.h.in
-+++ b/config/include/dcmtk/config/osconfig.h.in
-@@ -26,9 +26,6 @@
- /* Define if __attribute__((aligned)) supports templates */
- #undef ATTRIBUTE_ALIGNED_SUPPORTS_TEMPLATES
- 
--/* Define the canonical host system type as a string constant. */
--#undef CANONICAL_HOST_TYPE
--
- /* Define if char is unsigned on the C compiler */
- #undef C_CHAR_UNSIGNED
- 
---- a/ofstd/libsrc/ofconapp.cc
-+++ b/ofstd/libsrc/ofconapp.cc
-@@ -124,6 +124,9 @@
- 
- #endif // DCMTK_USE_WCHAR_T
- 
-+#define CANONICAL_HOST_TYPE "Debian"
-+
-+
- 
- void OFConsoleApplication::printHeader(const OFBool hostInfo,
-                                        const OFBool stdError)